Resolver: Batched Import Resolution #145108

LorrensP-2158466 · 2025-08-08T15:54:37Z

Transforms the current algorithm for resolving imports to a batched algorithm. Every import in the indeterminate_imports set is resolved in isolation. This is the only real difference from the current algorithm.

r? petrochenkov

compiler/rustc_resolve/src/lib.rs

compiler/rustc_resolve/src/imports.rs

LorrensP-2158466 · 2025-08-11T19:29:42Z

Code looks a little better now and should be more correct than the previous commits, but I have yet to find a way to resolve the current test failures.

LorrensP-2158466 · 2025-08-11T20:34:04Z

Okey, I did fix core not being built, but those other errors happened again. We now resolve the prelude import path when we create such an import at build_reduced_graph phase.

petrochenkov · 2025-08-11T22:39:59Z

Could you update the tests to make CI green, so I can see the difference?
(Even if the changes do not seem correct.)

tests/ui/imports/ambiguous-9.rs

tests/ui/imports/glob-conflict-cross-crate-1.rs

tests/ui/proc-macro/derive-helper-legacy-spurious.rs

petrochenkov · 2025-08-12T17:43:51Z

Moving prelude_import processing to build_reduced_graph may also be necessary for #139493.

LorrensP-2158466 · 2025-08-12T17:49:54Z

I'll create a pr for it.

compiler/rustc_resolve/src/imports.rs

petrochenkov · 2025-09-22T16:51:09Z

Waiting on author to analyze the crater regressions.
@rustbot author

rustbot · 2025-09-22T16:51:13Z

Reminder, once the PR becomes ready for a review, use @rustbot ready.

compiler/rustc_resolve/src/imports.rs

…r=petrochenkov Resolve: (Ref)Cell wrappers to deny mutation during spec resolution. Introduces wrappers around `Cell` and `RefCell` that only allow mutation when we are not in speculative resolution. This is preparatory work for rust-lang#145108. It would allow us to make `ImportData` and `ModuleData` sync and send safe. r? `@petrochenkov`

…r=petrochenkov Resolve: (Ref)Cell wrappers to deny mutation during spec resolution. Introduces wrappers around `Cell` and `RefCell` that only allow mutation when we are not in speculative resolution. This is preparatory work for rust-lang#145108. It would allow us to make `ImportData` and `ModuleData` sync and send safe. r? ``@petrochenkov``

Rollup merge of #146283 - LorrensP-2158466:resolve-cm-cell, r=petrochenkov Resolve: (Ref)Cell wrappers to deny mutation during spec resolution. Introduces wrappers around `Cell` and `RefCell` that only allow mutation when we are not in speculative resolution. This is preparatory work for #145108. It would allow us to make `ImportData` and `ModuleData` sync and send safe. r? ``@petrochenkov``

bors · 2025-09-26T12:00:07Z

☔ The latest upstream changes (presumably #147054) made this pull request unmergeable. Please resolve the merge conflicts.

…etrochenkov Test: Ambigious bindings in same namespace with the same res Add a test based on the discussion [here](https://rust-lang.zulipchat.com/#narrow/channel/421156-gsoc/topic/Project.3A.20Parallel.20Macro.20Expansion/near/542316157) and related to #145575 (comment). This is the most reduced form I could create that passes on nightly but fails with #145108 (see [#gsoc > Project: Parallel Macro Expansion @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/421156-gsoc/topic/Project.3A.20Parallel.20Macro.20Expansion/near/542335131)). Also not sure about the test names. r? `@petrochenkov`

…etrochenkov Test: Ambigious bindings in same namespace with the same res Add a test based on the discussion [here](https://rust-lang.zulipchat.com/#narrow/channel/421156-gsoc/topic/Project.3A.20Parallel.20Macro.20Expansion/near/542316157) and related to rust-lang/rust#145575 (comment). This is the most reduced form I could create that passes on nightly but fails with rust-lang/rust#145108 (see [#gsoc > Project: Parallel Macro Expansion @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/421156-gsoc/topic/Project.3A.20Parallel.20Macro.20Expansion/near/542335131)). Also not sure about the test names. r? `@petrochenkov`

Collect side effects from the current set of undetermined imports and only apply them at the end.

rustbot · 2025-10-08T14:13:22Z

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

LorrensP-2158466 · 2025-10-08T14:16:25Z

Rebased to get the changes from my previous PR.

LorrensP-2158466 · 2025-10-08T14:54:16Z

Ah right, that test.

LorrensP-2158466 · 2025-10-08T15:11:05Z

@petrochenkov I have reverted that change in finalize_resolutions_in, so you can run crater on that if needed. In the mean time i'll try and implemented as you suggested in the zulip thread.

rustbot assigned petrochenkov Aug 8, 2025

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Aug 8, 2025

This comment has been minimized.

Sign in to view

LorrensP-2158466 commented Aug 8, 2025

View reviewed changes

compiler/rustc_resolve/src/lib.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

LorrensP-2158466 marked this pull request as ready for review August 11, 2025 08:37

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 11, 2025

LorrensP-2158466 commented Aug 11, 2025

View reviewed changes

compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

petrochenkov reviewed Aug 11, 2025

View reviewed changes

petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 11, 2025

This comment has been minimized.

Sign in to view

LorrensP-2158466 force-pushed the batched-import-resolution branch from a3f8ae2 to 4a2a0dc Compare August 11, 2025 20:37

This comment has been minimized.

Sign in to view

petrochenkov added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 12, 2025

LorrensP-2158466 commented Aug 12, 2025

View reviewed changes

tests/ui/imports/ambiguous-9.rs Show resolved Hide resolved

LorrensP-2158466 commented Aug 12, 2025

View reviewed changes

tests/ui/imports/glob-conflict-cross-crate-1.rs Show resolved Hide resolved

LorrensP-2158466 commented Aug 12, 2025

View reviewed changes

tests/ui/proc-macro/derive-helper-legacy-spurious.rs Show resolved Hide resolved

LorrensP-2158466 commented Aug 12, 2025

View reviewed changes

tests/ui/proc-macro/derive-helper-legacy-spurious.rs Show resolved Hide resolved

petrochenkov reviewed Aug 12, 2025

View reviewed changes

compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved

compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved

compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved

LorrensP-2158466 mentioned this pull request Sep 6, 2025

Resolve: (Ref)Cell wrappers to deny mutation during spec resolution. #146283

Merged

petrochenkov mentioned this pull request Sep 16, 2025

Having made lint ambiguous_glob_imports deny-by-default and report-in-deps #146651

Closed

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 22, 2025

LorrensP-2158466 commented Sep 25, 2025

View reviewed changes

compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved

LorrensP-2158466 mentioned this pull request Sep 30, 2025

Test: Ambigious bindings in same namespace with the same res #147196

Merged

petrochenkov mentioned this pull request Oct 1, 2025

Permit duplicate imports #141043

Open

traviscross added the I-lang-radar Items that are on lang's radar and will need eventual work or consideration. label Oct 2, 2025

LorrensP-2158466 added 7 commits October 8, 2025 16:12

Resolver: Batched import resolution.

ee4faf9

Collect side effects from the current set of undetermined imports and only apply them at the end.

Several logical changes.

08235d4

Report glob errors in first phase of commit.

2043b9c

disallow ambiguous names imported from external crates

0a23ecc

bless test

c07c81e

revert change in finalize_resolutions_in + other small things

51f18e4

bless test for green CI

0bd2ce4

LorrensP-2158466 force-pushed the batched-import-resolution branch from 0eba015 to 0bd2ce4 Compare October 8, 2025 14:13

This comment has been minimized.

Sign in to view

bless another test

8f39eee

Resolver: Batched Import Resolution #145108

Are you sure you want to change the base?

Resolver: Batched Import Resolution #145108

Uh oh!

Conversation

LorrensP-2158466 commented Aug 8, 2025

Uh oh!

This comment has been minimized.

Uh oh!

This comment has been minimized.

This comment has been minimized.

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

LorrensP-2158466 commented Aug 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

LorrensP-2158466 commented Aug 11, 2025

Uh oh!

This comment has been minimized.

petrochenkov commented Aug 11, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

petrochenkov commented Aug 12, 2025

Uh oh!

LorrensP-2158466 commented Aug 12, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

petrochenkov commented Sep 22, 2025

Uh oh!

rustbot commented Sep 22, 2025

Uh oh!

Uh oh!

bors commented Sep 26, 2025

Uh oh!

rustbot commented Oct 8, 2025

Uh oh!

LorrensP-2158466 commented Oct 8, 2025

Uh oh!

This comment has been minimized.

LorrensP-2158466 commented Oct 8, 2025

Uh oh!

LorrensP-2158466 commented Oct 8, 2025

Uh oh!

Uh oh!

LorrensP-2158466 commented Aug 11, 2025 •

edited

Loading